From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 30 Oct 2001 18:19:46 +0000 (+0000)
Subject: (enriched-face-ans): FIx previous change.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~61087
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2dc96f0f8e2307d827eaa72da4d886e526d10bdb;p=emacs.git

(enriched-face-ans): FIx previous change.
---

diff --git a/lisp/enriched.el b/lisp/enriched.el
index 48baaca2b2f..bd474058b7c 100644
--- a/lisp/enriched.el
+++ b/lisp/enriched.el
@@ -347,17 +347,16 @@ One annotation each for foreground color, background color, italic, etc."
 	(and new (enriched-face-ans new))))
 	    
 (defun enriched-face-ans (face)
-  "Return annotations specifying FACE."
+  "Return annotations specifying FACE.
+FACE may be a list of faces instead of a single face;
+it can also be anything allowed as an element of a list
+which can be the value of the `face' text property."
   (cond ((and (consp face) (eq (car face) 'foreground-color))
 	 (list (list "x-color" (cdr face))))
 	((and (consp face) (eq (car face) 'background-color))
 	 (list (list "x-bg-color" (cdr face))))
-	((and (consp face) (symbolp (car face)) (not (keywordp (car face))))
-	 ;; List of faces `(face1 face2 ...)'.
-	 (let ((ans nil))
-	   (dolist (elt face)
-	     (setq ans (append ans (enriched-face-ans elt))))
-	   ans))
+	((listp face)
+	 (apply 'append (mapcar 'enriched-face-ans face)))
 	((string-match "^fg:" (symbol-name face))
 	 (list (list "x-color" (substring (symbol-name face) 3))))
 	((string-match "^bg:" (symbol-name face))